Merge tag '14.2.6-1' into bullseye-staging
authorPeter Michael Green <plugwash@raspbian.org>
Thu, 16 Jan 2020 14:14:52 +0000 (14:14 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Thu, 16 Jan 2020 14:18:02 +0000 (14:18 +0000)
commitcc51580116eb05e8268eb02debfe6bcbdd53fe30
tree61dad56d327b0d3efd1de8ffc9276ce62501f472
parentd21d5bc191c75c884496a72438829228ff45f42c
parent8d412765f4d996287aec321bd41d2a9f761aac53
Merge tag '14.2.6-1' into bullseye-staging
35 files changed:
debian/changelog
debian/patches/series
src/civetweb/examples/_obsolete/websocket_client/ssl/server.key.orig
src/civetweb/resources/cert/client.key.orig
src/civetweb/resources/cert/server.key.orig
src/civetweb/resources/cert/server_bkup.key.orig
src/erasure-code/jerasure/jerasure/Examples/makefile.orig
src/erasure-code/jerasure/jerasure/include/config.h.in~
src/erasure-code/jerasure/jerasure/makefile.orig
src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.sln
src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.vcproj
src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_config.vsprops
src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_main.vcproj
src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_test.vcproj
src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.sln
src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.vcxproj
src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_config.props
src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_main.vcxproj
src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_test.vcxproj
src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.cbproj
src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.groupproj
src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_all.cc
src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_link.cc
src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_main.cbproj
src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_unittest.cbproj
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.sln
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.vcproj
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.sln
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.vcproj
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main-md.vcproj
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main.vcproj
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test-md.vcproj
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test.vcproj
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest-md.vcproj
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest.vcproj